From: Jonas Dreßler <verdre@v0yd.nl>
Date: Thu, 7 Mar 2024 22:07:23 +0000 (+0100)
Subject: Revert "main: Only restore key focus on pop when modal actor is still focused"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2^2~21
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a64424864b61eeb7caf71fa1b4038893478c1d19;p=gnome-shell.git

Revert "main: Only restore key focus on pop when modal actor is still focused"

This one caused a regression and now keys appear to get stuck while raising
the screenShield, so revert it. Hopefully we can fix the original problem in
a better way next cycle by tracking key focus changes internally in
ClutterGrab.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7446

This reverts commit 4d544d7b5614cd33bf60c1b610f8b81546955fbb.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3231>
---

diff --git a/js/ui/main.js b/js/ui/main.js
index eeb83c9b1..9f1697df2 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -742,8 +742,7 @@ export function popModal(grab) {
         if (record.prevFocus)
             record.prevFocus.disconnect(record.prevFocusDestroyId);
         actionMode = record.actionMode;
-        if (global.stage.key_focus === record.actor)
-            global.stage.set_key_focus(record.prevFocus);
+        global.stage.set_key_focus(record.prevFocus);
     } else {
         // If we have:
         //     global.stage.set_focus(a);